From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 29 May 1993 04:36:40 +0000 (+0000)
Subject: (x-resolve-font-name): Allow symbol as FACE arg.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~95827
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=14e6867cdf4aca6b99c5c431122d86c583317d8c;p=emacs.git

(x-resolve-font-name): Allow symbol as FACE arg.
Allow t as FRAME arg.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index d6095380a78..4eb7db8015f 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -420,6 +420,10 @@ If PATTERN is nil, return the name of the frame's base font, which never
 contains wildcards.
 Given optional arguments FACE and FRAME, try to return a font which is
 also the same size as FACE on FRAME."
+  (or (symbolp face)
+      (setq face (face-name face)))
+  (and (eq frame t)
+       (setq frame nil))
   (if pattern
       (let ((fonts (x-list-fonts pattern face frame)))
 	(or fonts